pinned in progress
Remove flex styling
Use diffs, centralise state mutation in the main app