All features added. Done. Day 3.
Fixed merge conflicts.Added all features.