Some progress... Some bugs... Still experimenting...