Finished up map portions