Broke logging and stating into components