WIP, solidifying the design, and separating out specs