Works with OOP. Use the other branch though before I merge this back into master.