Port a couple more sections