Done!...with some minor changes needed!