added some basic features (planned)