Adding in more functionality