Rolled back all changes. Fixes found else where and this repo, as of now, is not needed i577. That may change later though...