First major commit, base version