Some hard work to make this thing a gem