Closes #1 hehe