Console reading now based on events, some renaming stuff.