major refactoring + update aws and local env