Finished everything except testing on Lightstreamer

Need to refactor first..