[#103] Moved functions around.