Merge pull request #18 from brain-murphy/brian-branch

Brian branch
send and ostensibly recieve
merge
Merge pull request #19 from brain-murphy/connorbranch

Connorbranch
fixed timer task. Its alive
merge
Merge pull request #20 from brain-murphy/connorbranch

Connorbranch
merged in working app
Should be working version
Merge pull request #21 from brain-murphy/connorbranch

Should be working version
merge