Initial parsing changes (minus race conditions)