Working towards no-canvas version
Added no-canvas mode.