Finally fixed this mess of a repo

don't even ask