Re-Added code that needs completion.