Initial commit of work so far