move the funcs up
Add missing @property