Uploading merged solution + working XNA w/ Map.