Final commit before i mess up everything