Simplified namings! building graph functions 95% done, one more!