Code to get you guys started on a few feature requests