Base system load pages

Prepare to merge into develop - most of the base system is complete, so we should be able to safely merge.