simplify, add susy, change to haml