ready for demo
from here, do you a) finish remaining feature set, or b) do major rewrite? ;p