updated skeleton a bit, still needs some work, but mostly there