Cleaned up Steps 0-9