Parking it for now (still has memory leaks) .. will fix it later