Still junking a lot more code.