committed initial work... still some sloppy leftovers from random stuff but I will deal with them later... hopefully.