mergey merge merge

merge merge...
Started fixing up some stuff in this project so that @aaldim1 and @Ivan1pl can start helping :smile: