Changes to design, cleaned up redundant code, series to be implemented.