included solutions in props function, testing is needed
More changes, added documentation for solutions