EPage messages added, need to parse better, added stuff to test