Added more code to parseICS
Merged conflicts