First try to organize everything. Exception not working yet