Cleaned up some code and got WHO HERE working