first commit, still lots of things to iron out