Added initial files, a few tweaks needed