Work on allowing for better documentation