Add working map and form
Complete assignment