Ignore and clean up
Add stuff
Use a better namespace
Let's go OO.