Even More Graphics Changes

Still not worknig