I have that second part in the works for the next branch