Should work now. There are dummy methods here and there but essentially it should work