Moving logic around