Merge, needs more clean up