Pretty much finished it, still a lot of cleanup to do though.