work in progress on fixing build