Good progress on base code