xairylle - Been working on fixing this piece in between tasks....