First major commit of changes