Fell asleep. Merging code