I made some progress, and swapped around some files

COMMIT FFS