initial (almost working) commit, actually