More work on basic build-out