Beginning to add qualification metrics and php clean-up
Merging conflicts