Last crappy design commit for Fred to review.