first round of development
Merge origin/mikes-code into mikes-code