Added some stuff for ..

Not sure if this is what we need just yet. I will be taking a break from
this for awhile.