Functional release

Fixed unfinished and broken stuff