object logic done
Merge pull request #1 from snoppy911/work

object logic done