#85 Moved modules over, fixed complaints
#85 fixed broken references that weren't tested
#85 found more errors by clearing compiled files, fixed them