Initial attempt at merging projects