nicer ui and moar features
fixing tests
Merge pull request #3 from apanzerj/apanzerj/current_wip

Much Work...wow