Meh, more or less done. Still need Graphics and code clean