working on returnblock
Merge branch 'master' into work
combining alpha values correctly
looks to work
emailing works