Working on logic
Merge branch 'staging' of https://github.com/sayems/Java into staging