Playing around with the depot, along with some code cleanup. Depot stuff
doesn't work yet.