
            Finish rebuilding feature in original branch with cleaner code

c2002a5