Added work on features. still running into issues