test
Add more features to zach's code