Revert "Starting to take shape"

This reverts commit a56773ba5e4ab30fd0376fa0ec2d331f6897bb63.
Revert "Revert "Starting to take shape""

This reverts commit 9dc6a506d506002c14376db45ac3db94a38c4fc9.