Finished up overloading methods.  Working through bug fixes.