Half updated to new onlin

-In progress, setup updated to segregate types of data to reduce the
amount of data being thrown around.