Worked on packages section a bit