Added more. Fixes #1

Added more. Fixes #1
Awesome job! Go ahead and merge this back into master.