Cleaned code, added getIdFromName method, need to add more objects.