first commit - martin's initial code