Feature/lcomp constant

This was an accidental branch, merging it back in to continue working on master.