Huge update, seems to be working
...