Massive change

Old version used strings for everything. Now using lists and strings -
it's a lot faster