re-commit initial

Re-committing code that works.