Added more functions (still in progress)