Refactor, add lejos code