Senior dev application

Hi,

code converted to a more OO style. 

Best,
Pere