Worked on support some more