Working 0.1.2 with class cleaned up