Refactored a lot of stuff. Updated to 1.0.0