add hammerhead stuff and remove crap