Major refactoring performed. Committed now to have an offsite backup ;-)