Just need to merge code and clean up

Home stretch