Made more generic

Ready to start working on implementing other file types now