Class encapsulation

2 jobs for master in 34 seconds