Finisihing up initial features