Tank stuff +Entity additions

see title