Deleted and moved stuff so it's clearer.