Fragmenting functioning, unit tests added. Passes integration tests. refs #12