WIP. Slowly nailing it down