Fixed bug, almost there