Admin stuff
Merged, Latest version
Adding manual graph calculations