Finishing touches on merge, succesfully compiles