Refactored everything to allow for WP updated from Github
Bug fixes and removed unused code