refactor and feature add
data overlay (feature add)
some stuff -- making it a bit fancy