Submit/cups update

There are still some small TODOs - anyway - give it a try!