Start work on Inline
Fixed a bad merge.