Adding/editing lots of stuff

Note: Had to remove libraries due to conflicts. Will upload in separate
repo.