Working on the heavy stuff
fixed the merge thing