committing first changes, havent tested