Added basic funcitonality