Much more Funktionality
- See commit for changes, IT IS ALOT ! ( even thought it's not much
code:p)