Wip

bringing up to base code