RWD works, needs cleanup