Closes #, Closes #7 for real this time