Added glimpse
Added todo tags with extra work