Starting to add LOFTEE, but need to take a break as it will require more changes