Added buttload of new stuff