added traps, last commit before Angry Koala changes