Major Rewrite

This version is a rewrite ensuring to create a robust codebase to work from, and with new key features.