added more feature implementation
working again
last commit before changing to new feaute set, will kill integration test