Made some progress
Added more stuff