small merge fixes
syncing with branch assignment_logic_refactor
further syncying with assignment logic refactor
Merge pull request #67 from whoisglover/assignment_logic_remerge

Assignment logic remerge