Refactor derivative steps
Add basic integral steps