Added lots'o'stuff