Cleaning up. First two steps working.