Added testing shit
Added some last minute things