Progress on Camera and Layer and stuff