finished 1.1
finished 1.2 and 8/21