Adding prep files
Fixing conflict + adding rest of work