Bring up to date with zarbozs fork...huge thanks to him