Real Initial Commit

This should bring the GitHub repo up to date with Daniel's work.