Cleaned up header file
Created framework files
Actually went up to git
Merge branch 'chris' into development