CLOSES #248 #320 #177 # 178 #249