Nice work! Would love to see this further updated but we'll probably have to wait until Morrison is done with his stuff.