Upload the second

Not completely polished yet and some ugly bugs