All working. Comments in progress