first commit : fork + basic clean up