Moved Stuff to .h file