Almost Done
Merge errors
Almost done