Initial progress commit, not working yet.