Lots of changes, haven't tested 100% yet.
TBH I'm still waiting on some data to convert.