Initial version with working map