Spiroche:  Final commit working with viewport