Finished for now

A working version of what I wanted to achieve