passing feature tests
WIP, break for checkin