added some more code
last couple of methods done
some edge case DateTime stupidity