Added dependencies, timeline bug fixes, structure changes