Mason redesign (should I make this mason)