first commit, pulling stuff in from initial work