Committing initial code - little changed since source, but moving in the right direction