Working on the whole expand thing