final commit for week 3. 5 native and 1 mashup working