fix build
Comment / rearrange work in progress