refactored addarbitration to happen at module completion time, instead of early
refactored addarbitration to happen at module completion time, instead of early

jameshegarty/rigel,jameshegarty/rigel,jameshegarty/rigel,jameshegarty/rigel,jameshegarty/rigel