flushing out the skeleton classes a little