rewrote ts and cs closes #20
rewrite some stuff closed #27 closes #13 closes #12