Just made it work

Still a lot of additional improvements required. Going to play it with
my wife now