Outlined stuff that will be fixed