working on bar to line transition, halfway done
merge with master