Moves new functions to class