Refactor/Design

by Tom Bates