more general commits to get the code going