Minor adjustments. Alot of implementation still needed