jdfreeman merge request

Bootstrappin' the hell outta Dixie Street Storage