Overhauled. Cleaner, but yet untested on hardware

Needs to be tested, but looks a lot better