started implementing Traps
merge