Created FreeForAll branch, optimized imports and code