Closes# 50 Closes# 51 Closes# 53