Switched around to integers from longs

Almost finished container stuff