Follow behavior

Merge all working behaviors into master.