temp commit
various, still fiddling around