A lot of stuff added, plus a debugger
git is acting weird so here is another commit