forgot 2 files (closes #44)