@nixpulvis this looks to work as you suggested. Cleaned up the various controllers to fit this and DRY eet up.