Changed message passer to have ONlist and SNlist as maps, also added connection timeout in message passer to prevent connect from hanging for a along time