fixing up bugs
added timeline, yet to implement