Added basic features to skeleton