2nd Commit with 80% functionality done