Add basic functionality and a little style