Merged in stuff from work pc.