converted to division project
Updated to play nice with Division Project
fixed and updated a few things
Merge branch 'division-project'