Cleaning up, making things functional.