some stuff
REDO THE ENTIRE THING
some more files