client/server working again in a cleaner fashion. so much to do -.-