@mikemcquaid please let me know of you still want this to be optional :)