Finish implementation of basic features