Initial attemp to re-implement map