Left some issues in with methods / values.