move definitions to separate file
add kill