created delicious code
code is now animal friendly
merged watermelon into master