Should be doing other work, decided to update this a bit more.