Finish adding missing funcitonalities.