This was becoming heavy to manage.

This is the first commit I do entirely in VE. It's a habit I'm planning
on taking as it helps a lot to find usability issues.