Refactor and README WIP