Major Update with Diego's changes (and NPCs, will change those to .png)