work on extensions, add TODOs