Totally redoing it based on the solutions...