My full solution! :)

I told stuart this was working