Huge rehaul. Everything is now ready for testing