Integrated codes done

Integrated the codes and solved bugs found during the process of
integration