Everything is implemented... just a wee bit of testing remains