Started on some of the functionality