Starting to add in more functionality