Writting on composition implementation. Did a proper re-write of all composition.