Adding Types List
REFACTORING
Finishing Metrics