Beginning a bit of an overhaul - save currently built up list