More Functional, but still broken