Huge commit. Fogot everything that I did but a lot has been done :)