Checkpoint, about to do some psuedo-namespace stuff