Uhh...yeah. updated a lot.
Added new files.
Fixed some conflicts