Add todo: move into separate method