version 1.2

All the functions are almost done.