new TODO and finish loadable part, next is key and surevyor