Semi Finished
Fixed merge conflicts