Big update, using Hashmaps now :)