intiial work for #70