Rewritten to Object
Not needed anymore
New errortype
Reformatting and recommenting