Tests passing. Some updates on issue closures: closed #6, closed #10, closed #11, closed #12, closed #13