did some stuff

not done but I thought i'd push anyway