BETTER DESIGN YAY. Almost there