Work in progress : Adding base features.