log.txt

commit 8615e37a6fdbbdb9754c1f7e0681741843a599d1
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Thu Apr 26 19:53:24 2018 -0500

    Added some more comments

commit a4ff3c8ecb927640068f68f9448486d17e2905dc
Merge: fc0bd35 46790a2
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Thu Apr 26 18:25:46 2018 -0500

    Merge branch 'master' of https://github.com/i-laird/Software_Group_Project

commit fc0bd3502b7781f0d8c488b48c3dbf2317f6c0fb
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Thu Apr 26 18:25:33 2018 -0500

    Added GRASP to the write up

commit 46790a2f2112a2537d7962674c678199ede9cff1
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Thu Apr 26 18:03:45 2018 -0500

    Updated the state JUNIT test

commit cab305e3fc97ad78f52507f340e431d240a78fba
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Thu Apr 26 10:58:45 2018 -0500

    added gantt

commit 01d8dfd367066f9c7e402fe04a772ef897a8549a
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Thu Apr 26 01:25:07 2018 -0500

    Added a sequence diagram

commit 4823dba7b0a518d54124987c8ca97deb7566ce62
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Thu Apr 26 00:51:57 2018 -0500

    Added design model

commit 2d4c5a6732d0900b6ba80505e812246c9c5a3e0b
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Wed Apr 25 23:39:17 2018 -0500

    used find bugs to fix errors

commit 4c79d219da41535231d2c11805112a10fe0b6f5f
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Wed Apr 25 21:46:43 2018 -0500

    Finished comments for every class

commit 2a8840e364e59f967dd039e7a0611522e539b273
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Wed Apr 25 20:46:11 2018 -0500

    Implemented the command design pattern

commit 3bb4de317950f4eb1da7a5dae62c8ed8ae1fe2ee
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Wed Apr 25 20:23:58 2018 -0500

    Added a game record

commit 99d3671dd2599510b18e6d6819d679681357e0b5
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Tue Apr 24 23:18:33 2018 -0500

    Made the game completely independent of the console

commit 9280c0c7368f3c1da8c0b24560037c12686bbff4
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Tue Apr 24 20:56:01 2018 -0500

    Implemented a UI for initializing the game

commit 281aa5608aeb26b48ca345ae56d50da30e672844
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Tue Apr 24 18:26:31 2018 -0500

    Added new classes to add user interface at the start

commit e169a3c329af1e5b7495c3fe16de2812bd3e35ed
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Mon Apr 23 22:46:08 2018 -0500

    Added some comments

commit 980ce2d340964f0402ae14f7da4c16c6d104058e
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Mon Apr 23 17:23:02 2018 -0500

    Added a memento JUNIt tester

commit 3fba3c086cb5c968bc49b077647c483039025618
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Mon Apr 23 15:59:59 2018 -0500

    Added singleton testing JUNIT

commit 5776563593a59a921a76a7e63bdf92978d79ee6e
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Mon Apr 23 13:02:27 2018 -0500

    Added tests for Direction Abstract Factory

commit 0cf1aa72b6282a55ab0189a9f846ae4d75bf88f3
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Mon Apr 23 12:55:33 2018 -0500

    Added JUNIT tests for Direction factory methods

commit f4cc865df0e93aa1cb4807e856b15fb1201e2470
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Mon Apr 23 12:47:43 2018 -0500

    Added JUNIT tests for snake Builder

commit b277f0f4aa422893bb91fd7eb51440cc0723f5cc
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Sun Apr 22 23:16:39 2018 -0500

    Added a get Ip function to Game

commit 32f7f631777069d92b8ab6719922b20b819278a5
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Sun Apr 22 21:52:34 2018 -0500

    Removed the class files from the commits

commit 1f2cd4f321c511f9398a2aa7aba8ca85b4e408ea
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Sun Apr 22 21:47:56 2018 -0500

    Modified mark down and added images to the LATEX

commit c45532c5ac40b826c3f12edbdb78337dc83716b9
Merge: fb7641b 11908c3
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Sun Apr 22 21:38:49 2018 -0500

    Fixed merge conflict

commit fb7641b75d8d7c379046b43ba7c178bceb6ddd9f
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Sun Apr 22 21:34:01 2018 -0500

    Added comments and the memento design pattern

commit 11908c3aaa2e72305bc86474983c4b15cb700c13
Merge: cd71662 01d8278
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Sun Apr 22 19:51:32 2018 -0500

    Fixed merged conflicts

commit cd71662619d41e841905b4b5174feb30a1a2240f
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Sun Apr 22 19:48:04 2018 -0500

    Added a component for text

commit 01d82784f06a62c0c785898c6987ae7a3aeaf548
Merge: c51854a 5fea45f
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Sun Apr 22 18:39:40 2018 -0500

    Fixed merge conflict

commit c51854ae6a495b657671aeb18728b132535313ed
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Sun Apr 22 18:33:42 2018 -0500

    Modified the Direction in the Screen

commit deda09d162b02c5be1c2e4ac2e41dd92f0a12dfd
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Sun Apr 22 18:31:37 2018 -0500

    switched from using direction enum to using Direction interface

commit 5fea45f96f0770d4574b853d9ec6d192239c7860
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Sun Apr 22 18:06:45 2018 -0500

    Added a new component to display text

commit ec0329da0a4ba2257c7a93da09d35bd477228695
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Fri Apr 20 02:14:18 2018 -0500

    Update models and LATEX

commit 3b2cba5c71687a8d5357588e6bf6b562cd248393
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Wed Apr 18 17:29:27 2018 -0500

    Commiting diagrams we have made

commit 929d318152f81db4d293e0b6d76739a6e059bcf0
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Wed Apr 18 15:23:59 2018 -0700

    Fixed a bug with closing windows on close

commit c6767e96ab05eb215ee11c70095714cdc23dfed5
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Wed Apr 18 15:12:23 2018 -0700

    Fixed bug with playing again

commit 6ab9f1c7c7f95e245f9148e3b1682518ac2ae89b
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Wed Apr 18 14:54:26 2018 -0700

    Fixed a bug with handling of container for Snake cells

commit 6145ccf8f468a8bfcc984d15c3fefa501b70ed80
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Wed Apr 18 14:48:42 2018 -0700

    Fixed a bug with arrow keys inverted

commit 898dfa7443eb0a5f34bbc6215fe98e77ae5333bf
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Wed Apr 18 14:36:18 2018 -0700

    Fixed a bug where the Snake wasn't clearing previous tiles

commit 8acb39759fa190a169787d9287aa2b720c4e7a82
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Wed Apr 18 14:27:11 2018 -0700

    Fixed a bug with the bound checking

commit d4908f5a89d21fb13ea32b64b5f875f1b752aff2
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Wed Apr 18 14:16:25 2018 -0700

    Changed rendering of snakes

commit 83e0f25c3fd350079738b163ca6146b823090440
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Wed Apr 18 14:14:28 2018 -0700

    Changed the color of Snake

commit a03e1cc5c88f326a02b4d317ddd76711a2d2c973
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Wed Apr 18 14:10:21 2018 -0700

    Added printStackTrace for exceptions

commit 8f8cb9d2e7bcfeb24a9ec159ec19e1e23d2c7b00
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Wed Apr 18 14:06:06 2018 -0700

    Updated move logic

commit 409aa584ed1061d7093245192ec13aaa969a89e5
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Wed Apr 18 14:01:18 2018 -0700

    Changed the way the squares are drawn

commit d36cbd9d2e0ad1fb6d15b6fb7646be5cd44cfd39
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Wed Apr 18 13:53:41 2018 -0700

    Added debugging code to the Screen

commit 6b86a6f6ce214743849660dfd46105712ea8ff89
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Mon Apr 16 15:27:01 2018 -0500

    Added a score to the Game class...this should be displayed to screen and maybe saved in the file

commit 485f123de7144a6533df88059c37763699c51f89
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Mon Apr 16 15:21:20 2018 -0500

    Made it so that game can be played again

commit 7d0b5083599cb71884968591f9b3c52ef8234a8f
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Mon Apr 16 15:04:13 2018 -0500

    Modified how player death was being calculated

commit 72e2c3d9daf91489452be3c7a8e8cdfc45b39619
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Sun Apr 15 21:21:43 2018 -0500

    Added factory method to Snake, and created SnakeBuilder

commit 965521c2a4d355399b477b8f968cc6f2611b5e58
Merge: 44d41ac 32e07b4
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Sun Apr 15 20:54:40 2018 -0500

    Fixed merge conflict

commit 44d41acfdc1dd5c7869b79045cdff545e49c4620
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Sun Apr 15 20:52:15 2018 -0500

    Preparing for merge

commit 32e07b4a884f4a5ecbbd11daaaadd003b7779973
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Sat Apr 14 18:27:44 2018 -0500

    Overhauled the key detection code

commit b1a0bb74e22c6a5616659c1ce572a1ab97c57b9f
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Tue Apr 3 22:37:56 2018 -0500

    Made it so that the powerUp is consistent across both server and client

commit 3f059c18b519d51df96a5f9da561549f2856d207
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Tue Apr 3 20:49:36 2018 -0500

    Commented the Screen class

commit d8e7f063720062e52305d8de9d4a4a018f9028fa
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Tue Apr 3 20:30:38 2018 -0500

    Fixed various bugs involving ArrayIndexOutOfBounds

commit 4731195fde10fb29f37c34f89ee5fa9dd3d88657
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Tue Apr 3 19:54:00 2018 -0500

    Fixed a bug in the initialization of the Snake

commit 5b815136e68527fa233c4610a884b27adaae078e
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Tue Apr 3 19:47:56 2018 -0500

    Removed the Color enum

commit af35b32c228e00b4169864eefd78608272b10da6
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Tue Apr 3 19:45:36 2018 -0500

    Implemented the direction change based on keystroke

commit 23844720a83d3b172577fcdbe8d50cb83b44b4ef
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Tue Apr 3 19:37:17 2018 -0500

    Changed the Screen to implement JFrame instead of JPanel

commit 0177f6d6deae12449fbfafa088bddf85cf47aa6d
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Tue Apr 3 19:28:56 2018 -0500

    Added a gitignore to ignore the .idea directory

commit bac8745c5cab39d947c4695420e4648086954b6e
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Tue Apr 3 19:24:31 2018 -0500

    Refactored name of drawSnake to plotSnake to be consistent

commit 200d96d75c89741dcef988df511af53f49aee091
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Tue Apr 3 19:23:29 2018 -0500

    Reworked the refresh functions

commit b6cf618f63f7cc0e773cc12bd9f4d9dd0e70f470
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Tue Apr 3 19:20:54 2018 -0500

    Reworked plotPowerUp

commit 7293cd3bfb2602a524ba2200ba1aaa8f01698e34
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Tue Apr 3 19:16:32 2018 -0500

    Reworked MovePlayers to use the new draw function

commit 63ba84c69f3e87b5cd1579e3f14b8f0908efd8c3
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Tue Apr 3 19:14:45 2018 -0500

    Implemented the drawSnake function and a getLocations function for the Snake

commit 75a3f91c36074e93bd17650a15bb202acc957e82
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Tue Apr 3 19:11:46 2018 -0500

    Moved the drawSnake function to the Screen

commit 9c16f77b9d60e23f2b78de1a638be4025c00a735
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Tue Apr 3 19:08:51 2018 -0500

    Added a refresh function to the Screen

commit 77b10b07cccde091ac18579f1dea703095f1e770
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Tue Apr 3 19:04:50 2018 -0500

    Implemented the plotBackground function in the Screen

commit 569e3848f68269e2edd960cbfda5016da0c449ec
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Tue Apr 3 19:03:43 2018 -0500

    Reworked the paintComponent function to draw from master matrix

commit 4327525b700e1a85a97db2dbd12fceb1ff2bee57
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Tue Apr 3 19:02:54 2018 -0500

    Added the uncolor location function

commit 33ae7eaa7f4944ebbdcbd5c511ed04175d039005
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Tue Apr 3 19:02:19 2018 -0500

    Updated the draw functions to load from a master matrix of colors

commit fc343a9e404980c925a13991ec9baca73d046700
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Tue Apr 3 18:59:17 2018 -0500

    Changed the showScreen method for the Screen object

commit 54c057880bfe9c63ee277aa1fa32cae81cba29da
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Tue Apr 3 18:58:14 2018 -0500

    Refactored the cell size for the screen

commit 8df91765f86cce812299fed32e5a26acf20c7279
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Tue Apr 3 00:35:55 2018 -0500

    Changed where Screen was being created (main -> Game)

commit 3acf67fef6dde588d9565441f3c8e536957e600c
Merge: 34cd2cc f2ed896
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Mon Apr 2 23:51:16 2018 -0500

    Readying for pull

commit 34cd2ccf48459a902ff119c484e5787f861fae8f
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Mon Apr 2 23:27:34 2018 -0500

    Commit before pull of Andrew's work

commit f2ed8968f76fa1564459706b2503ebf0957772bf
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Sat Mar 31 22:19:46 2018 -0500

    Added the function to pain powerups and the main Screen update function

commit fc9187bf02f5183e207fd0211c2a72bc361c33a5
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Sat Mar 31 22:17:35 2018 -0500

    Moved the color and uncolor fucntions to the GameBoard

commit 5f21e2348357491970c35e36e0e634dc088899ba
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Sat Mar 31 22:16:23 2018 -0500

    Added the GameBoard to the Screen

commit b69f18b41e05fadaeceed36a62232ff326c72925
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Sat Mar 31 22:09:46 2018 -0500

    Added a function to init the gameboard for the Screen

commit 454e8130fd019770e001c9c47374c37018cbaed9
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Sat Mar 31 22:04:01 2018 -0500

    Added a new class to hold the extended JPanel for the game board

commit 7c609bdd4e8aac550a667fc05c30be12e2863285
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Sat Mar 31 21:58:31 2018 -0500

    Added a function to toggle visibility of the Screen

commit 92bbfc0148b32c47d99abb1c7b9155955639bc75
Author: Andrew Walker <Andrew_Walker2@baylor.edu>
Date:   Sat Mar 31 21:55:33 2018 -0500

    Implemented a constructor for the Screen

commit cc8bd78ec0419ad025b09250f242fd6d76f00df0
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Wed Mar 28 00:57:19 2018 -0500

    Added comments to Game.java

commit 809252c23a5ce74df672555e69afab2da01f2a54
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Wed Mar 28 00:48:59 2018 -0500

    Changed from Using PrintWriter & Scanner on Network to data input and output streams

commit 902b25db7e3fb05242e4db5929803c6aadc96090
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Sun Mar 25 01:39:56 2018 -0500

    Added comments to most classes

commit 8d105a6553d622d4c71ee95c95b618825da8320c
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Fri Mar 23 22:59:00 2018 -0500

    Made more packages

commit ae754d92f8d225544ce18084aa1e7202b06f043c
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Fri Mar 23 22:46:30 2018 -0500

    Added packages

commit b4174f8fead2e503eb76d8943f711aaeada0ab19
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Fri Mar 23 22:34:04 2018 -0500

    Added Direction enum and implemented method that calculates location after move

commit 045b6bb6b9907cb7dba27b3b7c169eda391fd6d1
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Thu Mar 22 23:42:36 2018 -0500

    Added a method to Main to initialize Game

commit 236b8dff44cfab04192a2dd95b1547f5b0564aac
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Thu Mar 22 23:05:55 2018 -0500

    Updated readme to reflect progress

commit b748483db3b3dec0d080d69900fe6ac322229000
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Thu Mar 22 21:44:05 2018 -0500

    Fixed issue where I was usingbthe deque like a Stack as opposed to a Queue

commit 0a11400c0bb17ac9f592fbc6884b55842e1cabb3
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Thu Mar 22 16:23:07 2018 -0500

    Added override method in Server and CLient I had forgotten to do

commit e6513034cd62346b695bac0b2ae6505472dbde54
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Thu Mar 22 16:18:03 2018 -0500

    added Color Enum to represent player color

commit d041525cb5677be6c8a1d2176d940b100ad49b94
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Thu Mar 22 14:43:04 2018 -0500

    Updated readme to reflect recent modifications

commit e86cec486b957e82d7bd726e4b2cf5e5d75adcc6
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Thu Mar 22 14:39:00 2018 -0500

    extended Screen framework so that it will update and draw both background and the power up token

commit 8cb88ceeb8a16cecf46042f8d3c14126c3ea817c
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Thu Mar 22 14:21:00 2018 -0500

    Added a Cell Class to replace using pair<Integer, Integer>

commit 2fdeceea3cc62972b2b7bd5c9c31b1af4604c606
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Wed Mar 21 23:24:33 2018 -0500

    Slight changes to Game

commit c525a402451f54c693a0a7cfaef6383c22efec81
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Wed Mar 21 23:17:40 2018 -0500

    Did some more structural lay out on Game Class

commit bc7658a7b64e3479b606883a53fb3e86bbf1adf7
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Wed Mar 21 22:55:25 2018 -0500

    Added networking frameWork to the Game class

commit 241a7ad50c2f0e93218e7145c07a373152906574
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Wed Mar 21 22:26:33 2018 -0500

    Added readme and added some comments

commit d22c1d469ea0406210cc7d1fa02af88d9135e0f0
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Wed Mar 21 22:18:25 2018 -0500

    Did work on Game Class. It has two subclasses I have been creating

commit beca1d683983df33cf76218ee7a8ccca0b4fcae1
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Wed Mar 21 22:03:07 2018 -0500

    Added a GameMaker factory such that only one Game can be in existance, even its derived classes

commit d0631735587d54c70d51a8c825314632e7a5d3d5
Author: Ian Laird <ian_laird@baylor.edu>
Date:   Wed Mar 21 21:49:00 2018 -0500

    First commit. I am working on OO framework