Reorganizing and implementing some basic features.