Bootstrappin'

Sorry about this; this merge may suck...