Dirty version of the project. Will hopefully clean it up in the following days