Yeaaah! No errors anymore! But still needs moar work