Closes #9 but still have to do a cleanup