added timeline view made more spaghetti code