Realigned, and merged all code branches