CRAAG2 Layout: Re-work in progress...