Finish the obvious sqlizing, start fixing errors now