initial logic
Merge branch 'master' of https://github.com/projectchewie/server_side