Resolves #6, #7, and starts work on #5