work on testing & set up modules where needed