A few more functionss done!