Starts to tidy things up for implementation.