Closes #24 and closes #25