Check diff 2

Merging sal's wifly into master code