ticket:38 initial work