Finish this; fixes #1

yeap