reorganizing code from technical evaluation