DO MERGE THIS

This is just to show you guys what I am working on. I still have some more work to do and I need to sort out gitignore, but my computer is dying.