Debugging and adding features..