Move function to correct class...