Alpha Version

Almost there