Added some very basic who is functionality