Takes care of items 1, 3, and 5 for issue #55