Added more functions...off to bed