-Maybe like this?

epic
Commit this