fix the basics to get this working again