Finished merge with working components