mergin last commit, has all the changes i made, except i think its missing the last commit where i moved the header over. and code is still sloppy.

again, confused. tryn to push from local, just wana b done. git hates me.