well, it's mostly done. Just some conflicting bugs now