Checking in intermediate FS work before moving code.