Separated strategies into their own file
Work on UI. Added app service layer