working on #52 it will be finished tomorrow