map and timeline now work except for some bugs