Additions ohh fuck this is gonna break