Put in metric method functions
Delete file
Remove metric method
Update to work with new-style model selection