Started modifying main class
Merge branch 'master' of github.com:alexsirbu/idp