Second opinion on my logic set-up?