Nostalgia fix/extensibil

Categories: ,