Fixed Dependancies and Reference Issues.