added more draw code, and event code, and just.. more...