restructure specs
break it to make it
add bait stuff
General service support
cleanup