Fixed: infinite loop
Dev. checkpoint: Touchups.