Started adding LP functionality