A lot of work done.... Been kind of lazy on commits...