Update to latest on TooTallNate's repository