Added more function calls and finished some functions