Finished base implementation