Merged files

Merged some stuff from the local repo onto this new repo.
Lost like one commit, but it wasn't really important