initial ccommit. still need to add testing