Added lots of stuff from long time ago