better factories and new content
also added Frame class