Working Branch
fully functional alpha 2 source
Merge branch 'workingBranch'