Moving things in to builder. (reverted from commit ec17a2435c4533f6f5452b9ae9d4d0479e46f7a8)