changes after pull
continued work
continuing dev work on various parts of backend