Implementation File stuff + many bugfixes