All code is now object orientated