An OC Work-in-progress. Anything I should change or add?