Revert test commit; we'll flesh this out as a whole later.
Update Todo, add prototype pages for space/point/pin