Allllmost working properly...