Closes #25 and fixes seed