Refactored tiles, misc bugs left to fix