add binstubs
add more stuff