More Functions, nearly done