Made the code Object Orientated
Merge branch 'init'