Completed issues #77, #78, #79