Temp Version

Dont sync with this!! Functionality missing