Assignment logic remerge

Fixing rollback of brennons logic refactor for assignment creation.