Add additiona; functionality try to figure out what i really want to