Changed unit construction to be toggle based and removed friend functions from Logic