Small Fix + WIP Code