Update w/ beginning of initial sln - not finished!