Moving forward
Updates to Componet structure
Added window