Some new "framework" things, still avoiding real problems :)