Started rebuild of initial solution

Still not finished, we're working on it..