issue 1 and 2 build-out