cleaning up references. need to build one much better