Finished merge and moved things around