Adding some nice OO