implemented more of own API

One do tend to perfer working in ones own enviroment