A bunch more changes. Sloppy coding. I need to refactor and revisit - just trying to finish the MVP up.