Now looks more OO