First commit, everything seems to be solved at this point