Major rewrite going on
Fixed bugs. Functional!