-rm old code
add basic