Moved function definitios into inl file
Moved class member functions into inl file