Done, but needs some more testing. Looking pretty good.