Fix imports
Don't use return in Constructor
Implement some TODOs