Brian's branch

Finished setting up basic equations.