Make it so I can test program
fixed merge