Re-introduced shelf_bind. Moved Collection to Set. Cleaned up JSONification. Moar tests.