Made it more object-orientedish