Finishing touches (for now)