First Commit - Basic Components completed