More changes, added initial logic for llc calculation