Added first part of #19