Got this working now it's now trivial to keep doing this