Cleaned up and got some signals going.