Initial commit for SP related hacks