Move stuff around, handle null cleanly
Merge pull request #1 from caseywebdev/refactor

Move stuff around, handle null cleanly