Simplify, strip it down to a more simple and robust application.