modified make and solve functions; test functions not operational yet