Finishing up implementation