Complete Rewrite

The core framework for the the project