EVERYTHINGS BROKEN

adding in all sorts of features