Checkpint.
Working state.
Cleanup.
Merge Panda's changes and refactor.
Merge Panda's changes and refactor.
Merge commit 'bf2515723e0a18a5dc8bcdfc2265ccaed6e42e9e'