spacing
add pick messages
move tests to folder