More minor issues.
More of the safe stuff.
Re-structuring the front-end.