Finishing work for today.
Commiting morning work. All features working except hyphens