Major structural changes. This will probably break something.