Finalised entities.
Changed user to entity iìuser.
Updated wrapper to handle new class.
Need to develop unit structure manager.