Cleaned up, also watching js