Slef plug time! If buildfiles are a little tricky now, maybe this will help you when I do this after FEE3.
Just in case you were worried about the difficulty spike, this should clear up a lot of stuff.