- intended full functionallity

- intended to be the last version of the code, minor changes left to do
maybe??