commit the basics to get it to work