Finished up implementation!