Did some importing and fixing errors, more needed fixed