Working* commit!

* Working as in, no bugs that affect functionality** right now

** Functionality is pretty not there, no bugs though!