Implemented basic graphic stuff
Commit for GG
Removed test messages, resolved merge conflicts