Work on getting viewport working