added all functionality and fixed the bar/axis issue