Funcitonality working...need to make it pretty