Arrow functions mostly complete. Started on classes. Design tweaks.