Created data model for what is close to the final artifact that this application will require for this version of the product.
1. I did an EER diagram in MySQLWorkBench and exported a .png version
2. I used Netbeans to create Entity classes from a MySQL database (13 tables where-as before there were 2).
3. The main page (start page) now has sections for 'Collections', 'Portfolios' and 'Stocks' (I added collections).
4. I've got the changes all wired up and starting.  But its not complete - for example there is no way to create a collection or portfolio.
5. I tidied up the code a bit to make more elegant
6. I'm getting quite a collection of TODOs.  Some significant and others not so much.