Workable for now. Still a mess.