Loads more work on SP SDL; still doesn't link, needs a lot of cleaning up...