Moved things to header files, cleaned up some strings size is now 23922 bytes