Done (i think) encapsulating...