first commit
cleaned things up a bit