Adding initial commits/Bugs to be fixed yet