Started final part of implementation