Added new functionality

@markijbema Good luck ;)