Started styling, added more test compounds