Not the best commit
trying to merge what matt did
comitting this pid so I can checkout master