Add some constraint stuff, expand on closeness