Bakercat more progress

Now sort of works!