Layer updates. Probably at a point where this should become separate files.