some sht
Some refactoring, still very messy code.

Code isn't working. Dang it.
Code is still messy.