Current workings on my updated portfolio