more infrastructure blocks and changes

writing @ for named parameters is crap
also thinking whether semantic is crap and I should use bootstrap...
probably...