Started implentation of #20