Added a lot more baseline stuff