Will remove this class, was necessary because the solution was split.