started making it completly standalone