Added some works in progress, fixed some bolding