Add all methods to headers, will be split into proper public/private in next commit
Add all methods to headers, will be split into proper public/private in next commit