a big ugly commit, testing new stuff