finished implementing #39

gonna test to see if it works