refactor and draft of Unassigned
a few more logic bugs