For #29 all basic functionality appears to be working