Added more TODO and fixed method params