WIP: Basic structure works. Push state problems.