Initial refactor with boto