Some More Stuff that needs to be worked on