Add random stuff I found. Cleanup. Todo.