Tons of work, but crashing atm, working on bugfix