Task complete. Refectoring and quality still to be done. Need to use DAO classes. Styling.