Enhance 5

This is for my issue #5.  This works but it is not perfect, but rather kick something out than to sit on it.