Quick updates

Removed second class for now, will separate later