Refactored units out of all graph functions; handled in main graph.py function now