Continued adding to the support structure

Thanks to MrTwiggy for much of the skeletal code