Working on #2. Cleaning data really annoying....
Done with #2 and most of #3. Working on 3d