Removed the need for the akimbo struct
Lots of bug fixes to the new akimbo system