added stuff, saving for now; I know, its not a complete commit, but I have to go and want it backed up, issue #3