project1 submission

not quite complete yet