Oodles of changes from today's Sun test

Merging immediately!