mostly working, need to figure out why still overlapping