design implementation ready for testing
Merge conflict resolution (overwrote all dev changes... might need to redo changes)