Better basic framework.
Unsure what's new, done for the night, committing