third stretch goal and design cleaned up