First pass build-out