Stabalized online mode

Used the minimum number of changes to get it to a working state.