Working on adding more functionality