Here is a first attempt

See how exactly this interacts with issues and so forth