considerable progress and refactor , still way to go , emma nice work tbh ! )