Update to Assets

Removed outcommented section and removed/added some todos