Initial change for spam sandwich

More changes to come