Updated Client to use the proper draw scripts. Removed satisfied TODO statements.