BETA03

Almost done, except zoom in/out