Finished issues #22 #31 #33