Some more updates based on GroG's guidance.. (still no worky for GUI, but I feel like it's getting closer)