Horrible merge conflicts resolved. Also sexy L&F