Switch to C++. Added Screen and Point objects.