Added some functions.  Did a lot of work, but removed it because it sucked.