Should have commited this earlier, still plugging away.