Working on #104, still broken