Better parsing, cleaned up dead code, tiles still not added to template