2014.3.30

Code finished, need debugging