Baseline functional. Ready for a 0.1 release and packaging