Better listener

TODO: More efficient monitoring of functions & includes.