Initial commit
Start refractor to update API