Merge pull request #1 from Ocassio/east

Logic
Merge pull request #2 from Ocassio/master

Logic