WIP tweaks while TDDing some functionality