header guards added, Solver class initialized