First commit
Switch on OOP model