Created a better systed (no more class - since we where starting
millions of them and if we where not it was crashing).