Started to work on 'box' things. Still a mess.