Adding in some working stuff.