Initial commit of Andrea's changes