Added full objects, added encapsulated methods, activated them