Wrapping the old code, start on new graphics lib