merged in stuff from home mbp