Revert "Revert "Old Assignments fixed""

This reverts commit 75e8abeae68390cc3e7fc1c4e7f19bab5797049f.
Revert c83fd2e..6ab4868

This rolls back to commit c83fd2e345ffa3c058242bf5b463daa6ccf0c267.
Revert 5fda2c7..95c87f7

This rolls back to commit 5fda2c77172a4d15f0bdbee0c46313af3d3633c8.
Revert c83fd2e..bc8bb9e

This rolls back to commit c83fd2e345ffa3c058242bf5b463daa6ccf0c267.
all but delete work now