Added in place holders for features 2-3