Fixed! - Nailed it.. now I just need to fix stuff