Commit ready to work on mechanics