Added skelton code, still broken, lets fix it