Added files from Luis' project