Added a lot of functionality
Changed to testing repo