b2d fixed - d2b not fixed yet
Only added class basic structure