Have to leave so here are the changes. Nothing working yet.