fffff

fff
Some changes

This is the base - all further commits should really list actual
modifications