Getting closer... still broken though.