Restarted working on the cup version ... even though I lack motivation, I will try to finish it. Attached images