Redesigning the way the classes are defined and used to make life easier.  Also because I understand what I'm doing a bit more now