Add proper comments. Fix 'DONE' criteria