Added a lot of functionality. Should be near IOS now