Restructured + working on socket handlers