Did some reorganizing to turn indentifier into an actual class.