first commit - base code