need to work on jbuilder stuff