graphics working in progress
 merged