Adding barebone remaining steps