1.0 BETA: Working but pretty horrible, ie. no tests, heaps of code repeats etc