Getting uglier but more functional.