Started breaking down the code and added data