Merging...
Merge resolution... it compiles
Basic log-reg is in and works, speed needs to be improved