Added the markers and colors to it
Some changes and tweaks for the demo. Need to remove the hacky code.