Closes #1, and forgot a few things for #2