Added helper classes, started message handling