It all works!!!

added the last two controls in and the toggels.
deleted a comment

needed to merge the two branches.