Refactored code. Maybe ready to start adding logic?