As is build missing small pieces

Mostly complete