Merge pull request #4 from divanvisagie/dev

Dev
cleanup
began refactor
more refactor stuff