working somewhat
final
layout