Starting to add functionality to GUI... baby steps.
Restructured a tiny bit. Still baby steps -- but at least it loads correctly.