Finished basic functionality, Metrics

- finished basic functionality (untested)
-added Metrics