Starting to merge. (WIP)