Merge LLAB with bjc-r

Fixes #332 
@xtitter @peterasujan Take a look!

I don't think this is quite ready, but everything seems to work, so it should be mostly done. 
Also take a look at llab since there's a lot going on with that branch
@gissues:{"order":75,"status":"inprogress"}