finishing up core framework