checking status...
going to merge with master... 31 jan
fixed merge conflict
n funker det