Minor changes getting basic structure (test run live)