Workin
Merge branch 'master' of github.com:jtdaugh/beam
changed up bottom a bit