New interface and better backend - almost done