Worked on types some