Implemented stuff that was stubbed out