add port
refactor helpers out of app
add token model
chage json representation