diff --git a/data/3C286_20160324.txt b/data/3C286_20160324.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9ee907b85a97f0714203c9e47263cd3f3a5087ce
--- /dev/null
+++ b/data/3C286_20160324.txt
@@ -0,0 +1,158 @@
+parallactic angle:
+
+-62.19047473 -62.4465729  -62.69723612 -62.94349881 -63.18476331
+ -63.42046829 -63.65058141 -64.21773424 -64.42953936 -64.63628751
+ -64.83783043 -65.03442134 -65.22424458 -65.40800553 -65.84932179
+ -66.01011255 -66.16495502 -66.31255311 -66.4526457  -66.58495047
+ -66.70864683 -66.9877085  -67.07998922 -67.16259443 -67.23482037
+ -67.29612668 -67.34592055 -67.3838217  -67.41918159 -67.40641188
+ -67.3769754  -67.33034076 -67.2647219  -67.17806625 -67.06974395
+ -66.66907397 -66.46316677 -66.22518037 -65.95043856 -65.63636367
+ -65.27739679 -64.86926893 -63.49714225 -62.85358752 -62.13231045
+ -61.31024648 -60.37776226 -59.31396187 -58.10795913 -53.92242585
+ -51.95085556 -49.69296559 -47.08057944 -44.07089224 -40.52189511
+ -36.27464942 -21.52000161 -14.62510209  -7.14925559   0.61103923
+   8.34636221  15.7528599   22.57207581  36.92367845  41.06920059
+  44.53925128  47.47146417  50.02365771  52.24765894  54.1746587
+  58.29032321  59.47472168  60.5157265   61.43580351  62.24353165
+  62.96050121  63.58946606  64.93246282  65.33315783  65.68542696
+  65.99584356  66.26633387  66.50063062  66.70124162  67.08959495
+  67.19429694  67.27720615  67.33988374  67.38365798  67.40971056
+  67.41983032  67.37817879  67.33817841  67.28610309  67.22267358
+  67.14803985  67.06337227  66.96929038  66.68595855  66.56044624
+  66.42751968  66.28664751  66.1377319   65.98195622  65.81995702
+  65.3760949   65.19004479  64.99954642  64.80232666  64.59932529
+  64.39066531  64.17692262  63.60770019  63.37612144  63.13842434
+  62.89513425  62.64735069
+
+I:
+
+3.01070609e-02   2.93705828e-02   3.01470274e-02   2.99192939e-02
+    2.97996421e-02   3.00094737e-02   3.02085576e-02   2.95728951e-02
+    2.99582227e-02   2.94052019e-02   3.00235138e-02   2.93925620e-02
+    2.95239865e-02   2.91391909e-02   2.95963797e-02   2.95454293e-02
+    2.91082276e-02   2.93127558e-02   2.93368764e-02   2.93793349e-02
+    2.88490867e-02   2.89981518e-02   2.90839879e-02   2.88165566e-02
+    2.84201743e-02   2.90941547e-02   2.85729161e-02   2.91638055e-02
+    2.87122029e-02   2.89605639e-02   2.87305805e-02   2.86846335e-02
+    2.91242173e-02   2.88211453e-02   2.80206310e-02   2.76285532e-02
+    2.83877268e-02   2.81502809e-02   2.85580840e-02   2.84768081e-02
+    2.84574174e-02   2.73855433e-02   2.85641052e-02   2.86019756e-02
+    2.82201067e-02   2.86360507e-02   2.84457867e-02   2.87841731e-02
+    2.87278369e-02   2.85922812e-02   2.79135886e-02   2.81872352e-02
+    2.79369886e-02   2.81149623e-02   2.80950344e-02   2.80185015e-02
+    2.80854244e-02   2.81963993e-02   2.82355296e-02   2.81393264e-02
+    2.79003042e-02   2.80049499e-02   2.81364624e-02   2.81789872e-02
+    2.79403981e-02   2.79327669e-02   2.77606155e-02   2.83306182e-02
+    2.75536995e-02   2.82238893e-02   2.83838978e-02   2.88929656e-02
+    2.82753177e-02   2.84688998e-02   2.80669560e-02   2.79328935e-02
+    2.80967471e-02   2.76648158e-02   2.83741544e-02   2.77587417e-02
+    2.84536441e-02   2.80563545e-02   2.87198983e-02   2.83908753e-02
+    2.89548015e-02   2.88357709e-02   2.88021882e-02   2.91088205e-02
+    2.88013733e-02   2.91662811e-02   2.92030600e-02   2.88910368e-02
+    2.85199194e-02   2.85372218e-02   2.87557918e-02   2.87049449e-02
+    2.89057051e-02   2.91283179e-02   2.91124187e-02   2.90390364e-02
+    2.91064509e-02   2.91778262e-02   2.96819029e-02   2.91654473e-02
+    2.98341457e-02   2.93651932e-02   2.96333586e-02   2.94632732e-02
+    2.99570785e-02   2.90506375e-02   2.94945522e-02   2.93552871e-02
+    2.95206339e-02   2.96807812e-02   2.97757090e-02   2.96322370e-02
+    3.02541737e-02
+
+Q:
+
+  -9.68980088e-04  -9.42014184e-04  -9.21139411e-04  -1.00715833e-03
+   -9.27950584e-04  -1.02808113e-03  -9.51593704e-04  -9.30546311e-04
+   -9.06730541e-04  -1.00052193e-03  -9.45013105e-04  -9.25292279e-04
+   -9.40446738e-04  -9.22745707e-04  -9.51756403e-04  -9.18300606e-04
+   -1.02305384e-03  -9.65632148e-04  -1.01724981e-03  -9.25292269e-04
+   -8.74667018e-04  -9.73470531e-04  -1.01668653e-03  -9.64646560e-04
+   -9.18640975e-04  -9.24866930e-04  -9.47834561e-04  -8.73057161e-04
+   -9.27784624e-04  -9.67427631e-04  -9.09402553e-04  -9.65281568e-04
+   -9.34983453e-04  -9.15561688e-04  -9.05765103e-04  -8.86768640e-04
+   -9.25618764e-04  -8.53032053e-04  -8.93480348e-04  -9.24799528e-04
+   -9.39192841e-04  -8.08333828e-04  -8.41019343e-04  -8.98493174e-04
+   -8.77260645e-04  -8.74799080e-04  -8.66691862e-04  -8.67664028e-04
+   -8.05604869e-04  -8.06269385e-04  -7.70776138e-04  -7.54033067e-04
+   -7.00166088e-04  -6.60221358e-04  -6.03597560e-04  -4.85607216e-04
+   -3.18476078e-05   1.26849353e-04   4.19369135e-04   5.77328932e-04
+    7.57300989e-04   8.49120964e-04   9.86780519e-04   9.51648852e-04
+    9.57247884e-04   7.72454509e-04   7.91738787e-04   6.96883584e-04
+    6.77336091e-04   5.98396245e-04   4.69031932e-04   4.17157666e-04
+    4.15095977e-04   3.99503848e-04   3.61454482e-04   3.51937985e-04
+    2.59968671e-04   2.45106227e-04   2.23467466e-04   2.47030013e-04
+    1.71081948e-04   1.89389715e-04   1.69273163e-04   1.60949778e-04
+    1.45903975e-04   1.04411278e-04   1.32237909e-04   1.41994287e-04
+    1.38715507e-04   4.59903589e-05   9.52575525e-05   2.00411039e-04
+    1.78850907e-04   1.46820945e-04   1.50215642e-04   1.50905035e-04
+    1.20837367e-04   1.91717064e-04   1.78621922e-04   1.69502976e-04
+    1.76470777e-04   1.79323391e-04   1.66194461e-04   2.25756745e-04
+    2.00770991e-04   2.00040879e-04   2.28952945e-04   2.39167112e-04
+    2.61457877e-04   2.26954653e-04   1.80382264e-04   2.77659231e-04
+    2.37524243e-04   2.71682724e-04   3.78046806e-04   3.17065325e-04
+    2.89863935e-04
+
+U:
+
+  -1.67344807e-05  -5.51164925e-05  -5.95028958e-05  -4.27580784e-05
+   -1.31271570e-05   4.81366627e-05   3.52136928e-06  -5.22925167e-05
+    1.71840330e-05   9.84872800e-06   6.34679876e-05   1.56300589e-05
+    1.21756562e-05   4.30302058e-05   1.00355034e-04   5.91118120e-05
+    1.55934009e-04   7.19769876e-05   1.71540683e-04   8.30949042e-05
+    4.70675732e-05   1.05100733e-04   1.36413638e-04   8.54989022e-05
+    9.14438591e-05   1.48280405e-04   6.75539528e-05   8.53197558e-05
+    1.24017083e-04   1.06795847e-04   7.24131244e-05   5.84064977e-05
+    1.16224878e-04   1.05532267e-04   5.34648180e-05   1.02927090e-04
+    8.67173623e-05   4.54099416e-05   1.07846405e-04   7.17726839e-05
+    6.52007706e-05   2.72824918e-05   2.67420980e-06   2.88528486e-06
+   -3.38387210e-05  -3.93422406e-05  -8.76149771e-05  -4.75934537e-05
+   -1.39800480e-04  -2.57805123e-04  -3.35404189e-04  -3.20249487e-04
+   -4.13853949e-04  -4.71931560e-04  -5.94459081e-04  -6.53448347e-04
+   -8.32384168e-04  -8.42154219e-04  -8.02953090e-04  -6.69312983e-04
+   -4.15802047e-04  -2.87016344e-04  -8.90640514e-05   3.20505454e-04
+    4.20744659e-04   5.39632572e-04   5.41765247e-04   6.05732237e-04
+    6.47197648e-04   6.90892902e-04   8.06719711e-04   7.99145333e-04
+    7.98941686e-04   8.56936577e-04   8.15629879e-04   8.19490720e-04
+    8.08087502e-04   8.00346400e-04   8.55523909e-04   8.08768493e-04
+    8.67498883e-04   8.26625719e-04   8.47361031e-04   8.38002106e-04
+    8.68393523e-04   9.44925245e-04   8.86528313e-04   9.24198102e-04
+    8.87017071e-04   8.97327919e-04   9.23210495e-04   8.78401555e-04
+    8.36011150e-04   9.30683645e-04   9.06374310e-04   8.69812811e-04
+    8.98071762e-04   8.25775924e-04   8.76648286e-04   8.82670084e-04
+    8.96653390e-04   8.89782101e-04   8.96469776e-04   8.65120793e-04
+    8.67712709e-04   8.56971090e-04   9.25811929e-04   8.70353730e-04
+    8.78121110e-04   8.05848101e-04   8.75175339e-04   8.42675230e-04
+    9.04022865e-04   8.46470491e-04   9.33175120e-04   8.71278574e-04
+    9.48312360e-04
+
+V:
+
+   1.66378984e-04   1.80275154e-04   1.78637887e-04   1.64040389e-04
+    1.85907126e-04   2.05571920e-04   1.33916841e-04   7.39989649e-05
+    1.87174427e-04   1.31104601e-04   7.68250806e-05   1.15957998e-04
+    2.09345348e-05   1.93195301e-04   1.74443747e-04   8.33152862e-05
+    2.08059229e-04   1.45406807e-04   2.41074291e-04   6.15905375e-05
+    3.40331722e-04   4.37868736e-04   4.46806036e-04   4.60579580e-04
+    3.18137244e-04   4.77785113e-04   2.97078427e-04   1.39011361e-04
+    1.23765184e-04   2.21740886e-05   3.53309216e-06  -2.19683332e-05
+   -1.80468393e-04  -1.43991856e-04   2.98378853e-04   5.02172095e-04
+    5.27456493e-04   4.82788006e-04   4.86541128e-04   5.14470417e-04
+    4.09188253e-04   3.49390911e-04   3.71694518e-04   2.73464241e-04
+    2.71267935e-04   1.38447228e-04   7.30254320e-05   1.85556111e-04
+    1.84194458e-04   1.46379701e-04   5.15456851e-04   5.17000201e-04
+    7.15418295e-04   6.03130277e-04   3.95708630e-04   3.73648763e-04
+    3.43063581e-04   3.54860310e-04   3.48618502e-04   4.02171874e-04
+    4.45432171e-04   5.31274967e-04   5.16384755e-04   1.50428347e-04
+    2.64775595e-04   2.86220906e-04   8.75502200e-05  -2.31802751e-05
+   -7.18825392e-05  -9.30415913e-05  -7.38518606e-05  -1.30739957e-04
+    4.45179259e-05   2.49635853e-04   4.95135625e-04   6.06612427e-04
+    4.33832586e-04   4.21268624e-04   2.93363656e-04   4.68873094e-04
+    4.41437620e-04   3.54071434e-04   2.44180656e-04   6.44977668e-06
+   -5.21549833e-06   5.04356792e-05   6.56461949e-05  -4.26101289e-05
+   -5.73000602e-05   7.68439766e-05  -1.02606360e-04   2.06303302e-04
+    1.68161052e-04   3.95418323e-04   3.77243113e-04   3.46471020e-04
+    2.68569553e-04  -3.42495133e-05   5.12148764e-04   4.31752748e-04
+    3.27147636e-04   3.37097296e-04   3.14434126e-04   2.46363479e-04
+    3.53157171e-04  -4.38487152e-05  -4.49987109e-05   9.74797078e-06
+    5.32262175e-05   1.63939460e-04   2.86128518e-04   3.87795483e-05
+    4.73477503e-04   3.24116950e-05   1.70658879e-04   1.30260450e-04
+    4.04306396e-04
diff --git a/data/3C48_20160229.txt b/data/3C48_20160229.txt
new file mode 100644
index 0000000000000000000000000000000000000000..de78f0dd832fb50b423ee2113bc9c3ab386bd960
--- /dev/null
+++ b/data/3C48_20160229.txt
@@ -0,0 +1,180 @@
+Parallactic angle:
+
+-67.96666355 -68.20827095 -68.28640343 -68.3630127  -68.44012457
+ -68.51521996 -68.59080296 -68.66586464 -68.7404008  -68.81489171
+ -69.2331211  -69.44899218 -69.51836736 -69.58669245 -69.65441269
+ -69.72195684 -69.78887563 -69.85558885 -69.92080316 -69.98621613
+ -70.34784976 -70.53018625 -70.58906209 -70.64679467 -70.70338683
+ -70.75884195 -70.81458253 -70.86950013 -70.92323738 -70.97579652
+ -71.26563217 -71.40537913 -71.44889206 -71.49221545 -71.53393887
+ -71.57485911 -71.6146814  -71.65387171 -71.69141387 -71.72778669
+ -71.91636347 -71.9967807  -72.02026222 -72.04246782 -72.06280249
+ -72.08151273 -72.09855593 -72.11388775 -72.12746215 -72.13923117
+ -72.16911068 -72.15530174 -72.14593586 -72.13405307 -72.11947444
+ -72.10217992 -72.08180984 -72.05815758 -72.03169603 -72.00243325
+ -71.75571362 -71.57676844 -71.50835806 -71.43468362 -71.35595307
+ -71.27088361 -71.1813126  -71.08539542 -70.98404564 -70.87506971
+ -70.05187429 -69.52877771 -69.33323173 -69.12647964 -68.905189
+ -68.67108575 -68.42038793 -68.15817951 -67.87732471 -67.57988226
+ -65.29361755 -63.83760373 -63.27795962 -62.68115059 -62.04419734
+ -61.36382184 -60.61910808 -59.8301941  -58.98444579 -58.06615259
+ -50.50489763 -45.35687171 -43.22317003 -40.90181738 -38.20988498
+ -35.21122823 -31.8423258  -28.21328697 -24.29143045 -20.04433034
+   7.51579231  20.436441    24.61952043  28.55392234  32.18962611
+  35.52957835  38.50143705  41.11766537  43.42161381  45.53921005
+  55.07576425  58.17704727  59.08765223  59.93562145  60.72608503
+  61.4556724   62.1376496   62.76868173  63.36001112  63.9145792
+  66.64275161  67.62081424  67.91596971  68.19467325  68.45788844
+  68.70081923  68.93329472  69.15177683  69.35595288  69.55140566
+  70.52818794  70.89389556  71.00303858  71.10446108  71.19923062
+  71.28823586  71.37221228  71.44944736  71.52172615  71.59005032
+
+I:
+
+1.47026431e-02   1.49359324e-02   1.49844309e-02   1.51533027e-02
+    1.50224282e-02   1.49481296e-02   1.46115476e-02   1.44826435e-02
+    1.44116968e-02   1.42917596e-02   1.47894219e-02   1.44585457e-02
+    1.46829133e-02   1.45656368e-02   1.47306983e-02   1.44479217e-02
+    1.42780495e-02   1.40818281e-02   1.42219880e-02   1.43715812e-02
+    1.43249583e-02   1.42020335e-02   1.43028394e-02   1.44875674e-02
+    1.43922009e-02   1.45514501e-02   1.46112966e-02   1.40809717e-02
+    1.44406112e-02   1.47784477e-02   1.50197322e-02   1.48642733e-02
+    1.50455518e-02   1.49132264e-02   1.49352786e-02   1.49900410e-02
+    1.49267899e-02   1.47664428e-02   1.47299901e-02   1.50024539e-02
+    1.50030001e-02   1.50397178e-02   1.49023214e-02   1.48516362e-02
+    1.50619658e-02   1.49882909e-02   1.47999693e-02   1.47750415e-02
+    1.48364040e-02   1.49394995e-02   1.47466472e-02   1.47298911e-02
+    1.49715213e-02   1.47048456e-02   1.48065040e-02   1.47118264e-02
+    1.45370227e-02   1.47033005e-02   1.46848019e-02   1.43541755e-02
+    1.44154250e-02   1.44298516e-02   1.43130276e-02   1.44872693e-02
+    1.45140449e-02   1.45987358e-02   1.45351916e-02   1.44030688e-02
+    1.46024530e-02   1.45883743e-02   1.43140366e-02   1.41704824e-02
+    1.42218996e-02   1.41908606e-02   1.44349640e-02   1.44559523e-02
+    1.44112422e-02   1.44019497e-02   1.44485546e-02   1.45418240e-02
+    1.45702251e-02   1.42213439e-02   1.46458767e-02   1.46079856e-02
+    1.44432631e-02   1.43624444e-02   1.44419908e-02   1.41177045e-02
+    1.39109949e-02   1.42570264e-02   1.41577753e-02   1.40040446e-02
+    1.43354704e-02   1.41102725e-02   1.41826826e-02   1.44393319e-02
+    1.36956200e-02   1.41497833e-02   1.48407164e-02   1.52391751e-02
+    1.40837848e-02   1.43965167e-02   1.44255392e-02   1.42845480e-02
+    1.44714652e-02   1.28154958e-02   1.29005848e-02   1.45813308e-02
+    1.42776012e-02   1.45152966e-02   1.42750064e-02   1.40839514e-02
+    1.45058854e-02   1.36697087e-02   1.41023614e-02   1.39743582e-02
+    1.45234423e-02   1.41469740e-02   1.42596366e-02   1.36341826e-02
+    1.54357243e-02   1.20278674e-02   1.40153437e-02   1.64688700e-02
+    1.69772173e-02   1.49783483e-02   1.24784567e-02   1.11394173e-02
+    1.16310614e-02   1.29706448e-02   1.38843434e-02   1.38012866e-02
+    1.42195987e-02   1.42883782e-02   1.42076636e-02   1.40190321e-02
+    1.39791773e-02   1.38551210e-02   1.40751236e-02   1.42688628e-02
+
+Q: 
+   2.20725915e-04   2.80957937e-04   3.42345217e-04   3.54591242e-04
+    3.38312351e-04   2.47546705e-04   3.12782950e-04   3.12620714e-04
+    1.67126619e-04   1.97614208e-04   1.95821132e-04   2.71051879e-04
+    2.84181748e-04   4.03469549e-04   3.45070086e-04   1.74534499e-04
+    4.65277828e-04   2.09685673e-04   3.36557053e-04   2.63362485e-04
+    2.04709560e-04   3.02808253e-04   3.00882846e-04   3.23353287e-04
+    2.27326924e-04   3.14081268e-04   3.96481715e-04   3.73954428e-04
+    2.62932726e-04   1.89189890e-04   3.92307664e-04   2.26642170e-04
+    4.48874884e-04   1.45197571e-04   3.22102083e-04   1.73119579e-04
+    3.11215008e-04   2.56122130e-04   1.20827883e-04   2.44026748e-04
+    2.14941763e-04   2.60225537e-04   2.24246492e-04   2.82361086e-04
+    4.84574968e-04   1.68637798e-04   5.49642500e-04   1.59664635e-05
+    1.84280480e-04   1.87267404e-04   1.58898461e-04   3.32124000e-04
+    2.04095589e-04   3.66280260e-04   2.47239799e-04   3.87839550e-04
+    1.96504124e-04   4.58821471e-04   3.94926431e-04   3.65449338e-04
+    2.03727304e-04   3.39139491e-04   1.65209123e-04   2.93667085e-04
+    3.59503150e-04   1.61930376e-04   3.10328608e-04  -2.01728511e-05
+    3.76038844e-04   2.40490642e-04   2.01770840e-04   5.06840286e-04
+    5.04578120e-04   1.90315841e-04   2.58122064e-04   4.16922068e-04
+    2.51976455e-04   2.99135433e-04   4.49418315e-04   3.96505377e-04
+    3.66822248e-04   2.20766653e-04   5.26486863e-04   2.39613991e-04
+    5.99493041e-04   1.83344021e-04   5.21261455e-04   2.11976448e-04
+    4.48644182e-04   1.64724659e-04   6.39743902e-04   1.52341355e-04
+    5.32921321e-05   1.60224189e-04   2.79196049e-05   8.99560452e-05
+    3.71116136e-04   6.40335593e-05   1.24591842e-04   2.46751350e-04
+   -2.86003812e-04  -3.71937685e-04  -1.29419459e-04  -1.34186307e-04
+   -3.00500107e-04  -1.14699619e-04  -4.34229034e-04  -1.59555599e-04
+   -3.70051333e-05  -1.09003764e-04   6.35402969e-05   5.17575734e-05
+    5.78838368e-05   2.05433830e-05   2.14342412e-05   1.37126176e-04
+   -4.97932000e-05   1.00095571e-04  -1.18450281e-04   1.31576865e-04
+   -1.50379401e-04  -1.99030173e-04  -4.09719971e-04  -1.36330982e-04
+    1.86821788e-04   6.11923601e-04   5.57063077e-04   5.54436702e-04
+    1.85452083e-04   1.36820803e-04   1.83443492e-04   5.73614782e-05
+    8.14538697e-05   3.92586566e-05   7.11873768e-06   3.07499653e-05
+    7.65998053e-05   9.01679384e-05   1.12164981e-04   1.55763653e-04
+
+U: 
+   3.71738423e-05  -4.52073863e-06  -8.83288536e-06   4.79683691e-05
+    9.79406651e-06  -2.64450436e-05  -1.69996408e-05   5.87272360e-05
+    2.85308221e-05   2.21602211e-05   4.34981730e-05   1.95295262e-05
+    8.27671036e-06  -4.82588413e-05   3.14484620e-05  -2.07156476e-05
+    2.21210675e-05  -2.76534713e-05   8.21846611e-06   2.86856548e-05
+   -7.17544825e-05  -1.74054647e-06  -3.10026080e-05   4.97904323e-05
+    3.16825781e-05   3.33241678e-05   1.72426695e-05  -1.83395178e-05
+   -1.69088645e-05   3.14610285e-05   3.68222890e-05  -7.02810030e-05
+    8.45172935e-05   2.13671070e-05   2.38635742e-05  -3.31698167e-05
+   -1.10513358e-05  -3.78944899e-05   1.03747436e-05   1.27872701e-05
+   -8.13273944e-06   3.34206222e-05  -6.20649642e-05   4.18772691e-05
+    1.87582275e-05   2.30661912e-05   6.94952540e-06  -2.21263064e-05
+   -1.65446940e-05  -4.59498820e-05  -4.41583207e-05   3.73870617e-05
+   -2.43422643e-05  -1.91450811e-05   1.02563875e-05   1.28176481e-05
+    4.53756313e-07   4.84723556e-05   5.95239300e-06   2.76226875e-05
+   -3.30774776e-05   4.16730358e-05   2.77980201e-05   2.47214189e-05
+   -2.24601882e-05  -5.56918902e-05  -5.31739766e-05   9.73071278e-05
+   -9.73912071e-06   2.36580411e-05   1.36224852e-05   3.62289495e-05
+    5.16470580e-05  -2.11034913e-06   2.32347499e-05   4.70362560e-05
+    3.78813996e-05   3.98911230e-05   6.56727940e-05   5.69234857e-05
+    4.29740514e-05   7.72260149e-05   9.34297403e-05   6.05747118e-05
+    4.87499199e-05   1.14163352e-04   4.89706127e-05   1.58739929e-04
+    3.78349630e-05   4.73947119e-05   2.28832802e-04   2.08176139e-04
+    2.27031917e-04   1.79789534e-04   1.74162555e-04   1.72976885e-04
+    3.10309253e-04   1.98574743e-04   1.49537593e-04   2.18551172e-04
+    7.60501526e-05  -2.09487652e-05  -1.59147858e-05  -7.87308426e-05
+   -1.41533346e-04  -1.00040007e-04  -1.23806365e-04  -1.61790621e-04
+   -1.91799070e-04  -1.89309620e-04  -2.26450338e-04  -2.43567773e-04
+   -2.33687107e-04  -2.26009746e-04  -2.82803927e-04  -2.38256825e-04
+   -2.80594580e-04  -2.30932808e-04  -2.44998788e-04  -2.51355454e-04
+   -3.21652792e-04  -5.07637440e-04  -4.99237293e-04  -3.89936229e-04
+   -1.25368039e-04  -5.35942691e-05  -2.80720684e-05  -1.78568974e-04
+   -2.45494894e-04  -2.93724690e-04  -2.40192118e-04  -3.06484731e-04
+   -2.82674242e-04  -2.82348634e-04  -2.73628319e-04  -2.56960036e-04
+   -2.32466152e-04  -2.67683043e-04  -2.58072174e-04  -2.28044544e-04
+
+V:
+
+   1.70014726e-04   1.84763957e-04   1.50763954e-04   1.71841958e-04
+    1.55313082e-04   2.49181915e-04   1.86163482e-04   1.86208051e-04
+    2.53090366e-04   1.93088918e-04   1.33497666e-04   2.59823656e-04
+    2.77241472e-04   1.44724028e-04   1.54490395e-04   2.01656974e-04
+    1.66341886e-05   1.74521146e-04   7.67683835e-05   3.01894808e-05
+    8.88183989e-05   1.03702826e-04   1.25784397e-04   8.51177925e-06
+    7.06783752e-05  -3.44568394e-05  -1.95036132e-05  -1.62526138e-04
+    6.24746026e-05   1.23676454e-04   8.70954912e-05   1.85453239e-04
+    2.85808487e-05   7.15725038e-05   1.02221096e-04   1.86702090e-04
+    1.81415558e-04   2.18621477e-04   1.47598256e-04   1.76390142e-04
+    2.23046265e-04   3.55262232e-04   3.08842356e-04   2.73028888e-04
+    2.89679106e-04   3.31351555e-04   3.09888722e-04   3.30196138e-04
+    1.98214501e-04   2.51547622e-04   2.34349512e-04   2.90856895e-04
+    3.65546887e-04   2.35200871e-04   2.83138290e-04   2.44567651e-04
+    1.99889994e-04   2.05769323e-04   2.75275694e-04   1.68771262e-04
+    9.12414866e-05   6.65379792e-05   4.66426969e-05   1.71671117e-04
+    2.66240761e-04   3.38528842e-04   3.16642695e-04   3.31448818e-04
+    3.64033895e-04   3.80134951e-04   1.38777336e-04   6.16043664e-08
+    1.30191426e-05   8.59113954e-05   5.07460302e-05   9.95177189e-06
+    9.55175776e-05   1.47860463e-04   1.79314281e-04   1.34268558e-04
+    7.61786795e-05   4.14668692e-05   7.29610964e-05   1.55519280e-04
+    1.89973752e-04   1.57143981e-04   2.28093235e-06   4.58274285e-05
+   -1.27969046e-04  -8.97207269e-05   2.60719725e-04   1.22160623e-04
+    5.06506049e-05  -1.54872427e-05   1.78515096e-04   2.81058300e-04
+   -7.24730771e-05   1.16550193e-04   3.47647413e-04   4.38093503e-04
+    2.82855038e-04   2.21637234e-04   1.79733563e-04   2.42929461e-04
+    3.17607802e-04   2.87343440e-04   3.08094283e-04   3.88714618e-04
+    2.65247004e-04   4.03322306e-04   3.04448489e-04   2.23928334e-04
+    3.59036910e-04   3.41964568e-04   3.48219194e-04   2.63202457e-04
+    2.99887725e-04   2.82781426e-04   3.45610816e-04   2.06795455e-04
+    4.35127711e-04  -1.32423577e-04   1.67331247e-04   2.25423853e-04
+    2.84762879e-04   4.21422479e-05   9.57239670e-05   4.61229654e-05
+    1.15208985e-04   5.17046779e-06  -5.80348168e-05  -9.03658836e-05
+   -5.90276937e-05  -7.30852128e-05  -9.19994304e-05  -1.71231680e-04
+   -5.39896556e-05  -1.31617661e-04   1.02447247e-04   8.06090029e-05
diff --git a/src/fit.jl b/src/fit.jl
new file mode 100644
index 0000000000000000000000000000000000000000..22a295621ab6de80ed6a514a8590e3373743108e
--- /dev/null
+++ b/src/fit.jl
@@ -0,0 +1,14 @@
+include("mueller.jl")
+using NLopt
+
+# Set up NLopt
+opt = Opt(:LN_COBYLA, nfields(FlareModel) - 3)
+xtol_rel!(opt, σ/10)
+
+initial_step!(opt, init_steps)
+lower_bounds!(opt, lower_bounds)
+upper_bounds!(opt, upper_bounds)
+
+min_objective!(opt, (x, grad) -> cost(x, grad, data, vec(weights[j,:]), FlareModel())) # model, point
+minf, nlopt_return = optimize!(opt, flare)
+
diff --git a/src/fit.jl~ b/src/fit.jl~
new file mode 100644
index 0000000000000000000000000000000000000000..aea9ee24ee92f4bcbf43ddd92553c94db309517f
--- /dev/null
+++ b/src/fit.jl~
@@ -0,0 +1,2 @@
+include("mueller.jl")
+using NLopt
diff --git a/src/mueller.jl b/src/mueller.jl
index 630c1da0a33483b6fe827eaeaf69bff4d63ae66c..266b018fc2d3d6fff27163ecfe7412342b4374ee 100644
--- a/src/mueller.jl
+++ b/src/mueller.jl
@@ -1,19 +1,30 @@
+type Linear end
+type Circular end
+type General end
+
+function müller_rec(::General; ϵ = 0.0, ϕ = 0.0, ΔG = 1.0, α = 0.0, ψ = 0.0)
+    return [1             (-2ϵ*sin(ϕ)*sin(2α) + ΔG/2*cos(2α))       2ϵ*cos(ϕ) (2ϵ*sin(ϕ)*sin(2α) + ΔG/2*sin(2α))
+            ΔG/2                        cos(2α)                       0                    sin(2α)
+            2ϵ*cos(ϕ + ψ)          sin(2α)*sin(ψ)                   cos(ψ)            -cos(2α)*sin(ψ)
+            2ϵ*sin(ϕ + ψ)          sin(2α)*cos(ψ)                   sin(ψ)             cos(2α)*cos(ψ)]
+end
+
 function müller_rec(::Linear; ϵ = 0.0, ϕ = 0.0, ΔG = 1.0, δα = 0.0, ψ = 0.0, s = +)
-    ± = s(1.0)
-    ∓ = -±
-    return [1             ∓*ΔG/2       2ϵ*cos(ϕ) 2ϵ*sin(ϕ)
-            ΔG/2          ±            0         ±*2δα
-            2ϵ*cos(ϕ + ψ) ±*2δα*sin(ψ) cos(ψ)    ∓*sin(ψ)
-            2ϵ*sin(ϕ + ψ) ∓*2δα*cos(ψ) sin(ψ)    ±*cos(ψ)]
+    pm = s(1.0)
+    mp = -pm
+    return [1             pm*ΔG/2       2ϵ*cos(ϕ) 2ϵ*sin(ϕ)
+            ΔG/2          pm            0         pm*2δα
+            2ϵ*cos(ϕ + ψ) pm*2δα*sin(ψ) cos(ψ)    mp*sin(ψ)
+            2ϵ*sin(ϕ + ψ) mp*2δα*cos(ψ) sin(ψ)    pm*cos(ψ)]
 end
 
 function müller_rec(::Circular; ϵ = 0.0, ϕ = 0.0, ΔG = 1.0, δα = 0.0, ψ = 0.0, s = +)
-    ± = s(1.0)
-    ∓ = -±
-    return [1             ∓*2ϵ*sin(ϕ)  2ϵ*cos(ϕ)  ±*ΔG/2
-            ΔG/2          ∓*2δα            0         ±
-            2ϵ*cos(ϕ + ψ) ±*sin(ψ)      cos(ψ)   ±*2δα*sin(ψ)
-            2ϵ*sin(ϕ + ψ) ∓*cos(ψ)      sin(ψ)   ∓*2δα*cos(ψ)]
+    pm = s(1.0)
+    mp = -pm
+    return [1             mp*2ϵ*sin(ϕ)  2ϵ*cos(ϕ)  pm*ΔG/2
+            ΔG/2          mp*2δα            0         pm
+            2ϵ*cos(ϕ + ψ) pm*sin(ψ)      cos(ψ)   pm*2δα*sin(ψ)
+            2ϵ*sin(ϕ + ψ) mp*cos(ψ)      sin(ψ)   mp*2δα*cos(ψ)]
 end
 
 function müller_sky(PAaz)