Additions and some Pimping

SO MANY CHANGES.