Closes BH-3 and #4