Alright, time for sleep. Because of unforeseen events yesterday I ended up being distracted, but I did get some progress:

Now to add logic.