Added paragraph support... still needs work...