Big Additions

With great code comes great bugs !