Added more functions for daniel to work on.