updates, more skeleton work