minor refactor and started on simple basic test