Updated before dinner. Still need to work on the merge function.