deleted scaffolded crap - starting from scratch