Migrate to group based layers.

Though it doesn't work. Sorry Bacon.