initial commit, working draft