98% complete. just lots of testing and minor changes to go now.