Nick's branch commit

better zoom and everything