Freelancer:
mkilly
Redesign
Version 2 of #568