Added bolth.
Added 'ol' handling. Still very very ugly.