sorry for this big commit, had to merge into the dev branch so excuse me