Refactored some code

Data modeling practice
Added some key stroke detection
Started migration data modeling