Visual and functional updates.
more working code