Version 1.1.0
Refactored everything
Version ready for testing