WIP: partial rewrite of base specs on master