Working on box logics in the client, take 2