Hotfix 2: Continued to work on it :)