Sorry forgot to commit for like a month so a lot of changes\!\!\!