1. Enhance.Many added, a bit rough UI-wise still but it behaves reasonable