@caitp I'm planning on merging this in today. Could you hop onto the hangouts chat so I can understand what you mean here?