Unclean files

Working, compiling, just need to be cleaned up.