First pass for batman
Will upload more changes in the future