A complete re-working to come some day.