Appears to be working how it should. Testing it again from scratch.