Moved code to header files, templates...